Remove build option `ASM_ASSERTION`

The build option `ENABLE_ASSERTIONS` should be used instead. That way
both C and ASM assertions can be enabled or disabled together.

All occurrences of `ASM_ASSERTION` in common code and ARM platforms have
been replaced by `ENABLE_ASSERTIONS`.

ASM_ASSERTION has been removed from the user guide.

Change-Id: I51f1991f11b9b7ff83e787c9a3270c274748ec6f
Signed-off-by: Antonio Nino Diaz <[email protected]>

diff --git a/Makefile b/Makefile
index d03c2bf24d4d64ee0d45ca7ba1159e48af7e42f4..31460d4c85af6d0a3c73c7524039ba9ccd828d39 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,10 +50,13 @@ include ${MAKE_HELPERS_DIRECTORY}build_env.mk
 # Default values for build configurations, and their dependencies
 ################################################################################
 
+ifdef ASM_ASSERTION
+        $(warning ASM_ASSERTION is removed, use ENABLE_ASSERTIONS instead.)
+endif
+
 include ${MAKE_HELPERS_DIRECTORY}defaults.mk
 
 # Assertions enabled for DEBUG builds by default
-ASM_ASSERTION                  := ${DEBUG}
 ENABLE_ASSERTIONS              := ${DEBUG}
 ENABLE_PMF                     := ${ENABLE_RUNTIME_INSTRUMENTATION}
 PLAT                           := ${DEFAULT_PLAT}
@@ -440,7 +443,6 @@ endif
 # Build options checks
 ################################################################################
 
-$(eval $(call assert_boolean,ASM_ASSERTION))
 $(eval $(call assert_boolean,COLD_BOOT_SINGLE_CPU))
 $(eval $(call assert_boolean,CREATE_KEYS))
 $(eval $(call assert_boolean,CTX_INCLUDE_AARCH32_REGS))
@@ -480,7 +482,6 @@ $(eval $(call add_define,ARM_CCI_PRODUCT_ID))
 $(eval $(call add_define,ARM_ARCH_MAJOR))
 $(eval $(call add_define,ARM_ARCH_MINOR))
 $(eval $(call add_define,ARM_GIC_ARCH))
-$(eval $(call add_define,ASM_ASSERTION))
 $(eval $(call add_define,COLD_BOOT_SINGLE_CPU))
 $(eval $(call add_define,CTX_INCLUDE_AARCH32_REGS))
 $(eval $(call add_define,CTX_INCLUDE_FPREGS))

diff --git a/common/aarch32/debug.S b/common/aarch32/debug.S
index bafce7cef8366424fb87c3ed4302b6ede792828b..adb6dc3eeb6cb81c05cc5dd66eeb6b60cb62cfcc 100644 (file)
--- a/common/aarch32/debug.S
+++ b/common/aarch32/debug.S
@@ -90,7 +90,7 @@ func report_exception
        no_ret  plat_panic_handler
 endfunc report_exception
 
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
 .section .rodata.assert_str, "aS"
 assert_msg1:
        .asciz "ASSERT: File "
@@ -155,7 +155,7 @@ dec_print_loop:
 #endif /* LOG_LEVEL >= LOG_LEVEL_INFO */
        no_ret  plat_panic_handler
 endfunc asm_assert
-#endif
+#endif /* ENABLE_ASSERTIONS */
 
 /*
  * This function prints a string from address in r4

diff --git a/common/aarch64/debug.S b/common/aarch64/debug.S
index 3d8e0f413fc3d0841690effee42e210c0ff0c9a7..cdb4ec6cd0ab8a4d1dc7e9bdb86bf80669a606c6 100644 (file)
--- a/common/aarch64/debug.S
+++ b/common/aarch64/debug.S
@@ -41,7 +41,7 @@
 /* The offset to add to get ascii for numerals '0 - 9' */
 #define ASCII_OFFSET_NUM       0x30
 
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
 .section .rodata.assert_str, "aS"
 assert_msg1:
        .asciz "ASSERT: File "
@@ -106,7 +106,7 @@ _assert_loop:
 #endif /* LOG_LEVEL >= LOG_LEVEL_INFO */
        no_ret  plat_panic_handler
 endfunc asm_assert
-#endif
+#endif /* ENABLE_ASSERTIONS */
 
 /*
  * This function prints a string from address in x4.

diff --git a/docs/user-guide.md b/docs/user-guide.md
index af083605c794f219b067e454c5a12d31e793040e..a69c1223db1628a8669252077acb47b2c598ef0c 100644 (file)
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -203,11 +203,6 @@ performed.
     in MPIDR is set and access the bit-fields in MPIDR accordingly. Default
     value of this flag is 0.
 
-*   `ASM_ASSERTION`: This flag determines whether the assertion checks within
-    assembly source files are enabled or not. This option defaults to the
-    value of `DEBUG` - that is, by default this is only enabled for a debug
-    build of the firmware.
-
 *   `BL2`: This is an optional build option which specifies the path to BL2
     image for the `fip` target. In this case, the BL2 in the ARM Trusted
     Firmware will not be built.

diff --git a/include/common/aarch32/el3_common_macros.S b/include/common/aarch32/el3_common_macros.S
index d7e0b3f5d03267ed271a2aa2f488a5764857d3bf..9158203501e2a4d0b8dd52616e5892a2ad34d4fa 100644 (file)
--- a/include/common/aarch32/el3_common_macros.S
+++ b/include/common/aarch32/el3_common_macros.S
@@ -148,7 +148,7 @@
                _init_memory, _init_c_runtime, _exception_vectors
 
        /* Make sure we are in Secure Mode */
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        ldcopr  r0, SCR
        tst     r0, #SCR_NS_BIT
        ASM_ASSERT(eq)

diff --git a/lib/aarch32/misc_helpers.S b/lib/aarch32/misc_helpers.S
index 5b17c21cf5667da4dc30f108d0fad52ead9f6bf0..03b47eae21ea9e5360b09a7a08dc8a2b7fb23b82 100644 (file)
--- a/lib/aarch32/misc_helpers.S
+++ b/lib/aarch32/misc_helpers.S
@@ -162,7 +162,7 @@ endfunc zeromem
  * --------------------------------------------------------------------------
  */
 func memcpy4
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        orr     r3, r0, r1
        tst     r3, #0x3
        ASM_ASSERT(eq)

diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S
index 84265e0b2a58a62a81bf1d6096aeaf9631b5f058..74550aa24ee72a915f91c5ab394df936873acca4 100644 (file)
--- a/lib/aarch64/misc_helpers.S
+++ b/lib/aarch64/misc_helpers.S
@@ -215,7 +215,7 @@ func zeromem_dczva
        tmp1         .req x4
        tmp2         .req x5
 
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        /*
         * Check for M bit (MMU enabled) of the current SCTLR_EL(1|3)
         * register value and panic if the MMU is disabled.
@@ -228,7 +228,7 @@ func zeromem_dczva
 
        tst     tmp1, #SCTLR_M_BIT
        ASM_ASSERT(ne)
-#endif /* ASM_ASSERTION */
+#endif /* ENABLE_ASSERTIONS */
 
        /* stop_address is the address past the last to zero */
        add     stop_address, cursor, length
@@ -247,7 +247,7 @@ func zeromem_dczva
        mov     tmp2, #(1 << 2)
        lsl     block_size, tmp2, block_size
 
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        /*
         * Assumes block size is at least 16 bytes to avoid manual realignment
         * of the cursor at the end of the DCZVA loop.
@@ -444,7 +444,7 @@ endfunc zeromem_dczva
  * --------------------------------------------------------------------------
  */
 func memcpy16
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        orr     x3, x0, x1
        tst     x3, #0xf
        ASM_ASSERT(eq)

diff --git a/lib/cpus/aarch32/aem_generic.S b/lib/cpus/aarch32/aem_generic.S
index 3d6064c93d7628572cfe4730b0fe1797ebcee2b2..7374e2508d3ba97ec63e76d9bb8be7c27acb3221 100644 (file)
--- a/lib/cpus/aarch32/aem_generic.S
+++ b/lib/cpus/aarch32/aem_generic.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -35,7 +35,7 @@
 
 func aem_generic_core_pwr_dwn
        /* Assert if cache is enabled */
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        ldcopr  r0, SCTLR
        tst     r0, #SCTLR_C_BIT
        ASM_ASSERT(eq)
@@ -51,7 +51,7 @@ endfunc aem_generic_core_pwr_dwn
 
 func aem_generic_cluster_pwr_dwn
        /* Assert if cache is enabled */
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        ldcopr  r0, SCTLR
        tst     r0, #SCTLR_C_BIT
        ASM_ASSERT(eq)

diff --git a/lib/cpus/aarch32/cortex_a32.S b/lib/cpus/aarch32/cortex_a32.S
index f631c4cf7283a17a3074648d48332302f483d444..8cd79330f5b6619e0056249c6a77a8fc37c4cac8 100644 (file)
--- a/lib/cpus/aarch32/cortex_a32.S
+++ b/lib/cpus/aarch32/cortex_a32.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -76,7 +76,7 @@ func cortex_a32_core_pwr_dwn
        push    {r12, lr}
 
        /* Assert if cache is enabled */
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        ldcopr  r0, SCTLR
        tst     r0, #SCTLR_C_BIT
        ASM_ASSERT(eq)
@@ -107,7 +107,7 @@ func cortex_a32_cluster_pwr_dwn
        push    {r12, lr}
 
        /* Assert if cache is enabled */
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        ldcopr  r0, SCTLR
        tst     r0, #SCTLR_C_BIT
        ASM_ASSERT(eq)

diff --git a/lib/cpus/aarch32/cpu_helpers.S b/lib/cpus/aarch32/cpu_helpers.S
index dc1b6e61989e50a08b7dfbacc8ab6a4a2087faaa..7606b8e28fad48cb212081605df936dfeef7ef01 100644 (file)
--- a/lib/cpus/aarch32/cpu_helpers.S
+++ b/lib/cpus/aarch32/cpu_helpers.S
@@ -53,7 +53,7 @@ func reset_handler
        /* Get the matching cpu_ops pointer (clobbers: r0 - r5) */
        bl      get_cpu_ops_ptr
 
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        cmp     r0, #0
        ASM_ASSERT(ne)
 #endif
@@ -92,7 +92,7 @@ func prepare_cpu_pwr_dwn
        pop     {r2, lr}
 
        ldr     r0, [r0, #CPU_DATA_CPU_OPS_PTR]
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        cmp     r0, #0
        ASM_ASSERT(ne)
 #endif
@@ -118,7 +118,7 @@ func init_cpu_ops
        cmp     r1, #0
        bne     1f
        bl      get_cpu_ops_ptr
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        cmp     r0, #0
        ASM_ASSERT(ne)
 #endif

diff --git a/lib/cpus/aarch64/cpu_helpers.S b/lib/cpus/aarch64/cpu_helpers.S
index 47cb6a2deda956e60bd32abe3d7a7339dc62cff2..6a399167956f3bc551a8880287ab4a10178c4779 100644 (file)
--- a/lib/cpus/aarch64/cpu_helpers.S
+++ b/lib/cpus/aarch64/cpu_helpers.S
@@ -55,7 +55,7 @@ func reset_handler
 
        /* Get the matching cpu_ops pointer */
        bl      get_cpu_ops_ptr
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        cmp     x0, #0
        ASM_ASSERT(ne)
 #endif
@@ -94,7 +94,7 @@ func prepare_cpu_pwr_dwn
 
        mrs     x1, tpidr_el3
        ldr     x0, [x1, #CPU_DATA_CPU_OPS_PTR]
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        cmp     x0, #0
        ASM_ASSERT(ne)
 #endif
@@ -120,7 +120,7 @@ func init_cpu_ops
        cbnz    x0, 1f
        mov     x10, x30
        bl      get_cpu_ops_ptr
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        cmp     x0, #0
        ASM_ASSERT(ne)
 #endif

diff --git a/plat/common/aarch64/platform_mp_stack.S b/plat/common/aarch64/platform_mp_stack.S
index e3063d14b2152f5934742c9112d3c0cbd8a6694b..322e3bb7439a1338fe6dd0aeb7d66ea4a02ea81c 100644 (file)
--- a/plat/common/aarch64/platform_mp_stack.S
+++ b/plat/common/aarch64/platform_mp_stack.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -131,7 +131,7 @@ endfunc platform_set_stack
         * -------------------------------------------------------
         */
 func_deprecated platform_get_stack
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        mrs     x1, mpidr_el1
        cmp     x0, x1
        ASM_ASSERT(eq)
@@ -150,7 +150,7 @@ endfunc_deprecated platform_get_stack
         * -----------------------------------------------------
         */
 func_deprecated platform_set_stack
-#if ASM_ASSERTION
+#if ENABLE_ASSERTIONS
        mrs     x1, mpidr_el1
        cmp     x0, x1
        ASM_ASSERT(eq)